Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 5 Apr 2010 21:59:15 +0000 (21:59 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 5 Apr 2010 21:59:15 +0000 (21:59 +0000)

Trivial merge